From: Alexander Larsson <alexl@redhat.com>
Date: Mon, 28 Feb 2011 20:34:48 +0000 (+0100)
Subject: Extend, don't replace GI_TYPELIB_PATH in gnome-shell launcher
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~8839
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=ddc135839b5ecc7a8b4ca04b048b9aa4a95a89aa;p=gnome-shell.git

Extend, don't replace GI_TYPELIB_PATH in gnome-shell launcher

Without this we can't support some gi typelibs being in system
directories.
---

diff --git a/src/gnome-shell.in b/src/gnome-shell.in
index 32bf81c63..dd5e9674c 100755
--- a/src/gnome-shell.in
+++ b/src/gnome-shell.in
@@ -195,6 +195,8 @@ def start_shell(perf_output=None):
                 'NO_AT_BRIDGE'        : '1'})
 
     if running_from_source_tree:
+        if os.environ.has_key('GI_TYPELIB_PATH'):
+            typelib_dir = typelib_dir + ":" + os.environ.get('GI_TYPELIB_PATH')
         env.update({'GNOME_SHELL_DATADIR'  : data_dir,
                     'GI_TYPELIB_PATH'      : typelib_dir,
                     'GSETTINGS_SCHEMA_DIR' : data_dir })